GPSBabelGUI: Enquote gpsbabel.exe commandline.

In input options dialog try to filter out some options thought for the output.

diff --git a/win32/gui-2/GPSBabelGUI.dof b/win32/gui-2/GPSBabelGUI.dof
index 8788f27262c0fe0e3d46531c109cd2272c7866ff..6fe9ebaa6655b55efe55f5b8a06a976ecf235fe5 100644 (file)
--- a/win32/gui-2/GPSBabelGUI.dof
+++ b/win32/gui-2/GPSBabelGUI.dof
@@ -56,7 +56,7 @@ IncludeVerInfo=1
 AutoIncBuild=0\r
 MajorVer=0\r
 MinorVer=2\r
-Release=13\r
+Release=14\r
 Build=0\r
 Debug=0\r
 PreRelease=0\r
@@ -68,7 +68,7 @@ CodePage=1252
 [Version Info Keys]\r
 CompanyName=GPSBabel Makers\r
 FileDescription=GPSBabel Windows Frontend\r
-FileVersion=0.2.13.0\r
+FileVersion=0.2.14.0\r
 InternalName=\r
 LegalCopyright=(C) 2005-2008 Olaf Klein (o.b.klein@gpsbabel.org)\r
 LegalTrademarks=\r

diff --git a/win32/gui-2/GPSBabelGUI.res b/win32/gui-2/GPSBabelGUI.res
index 3776c1003a776aeaf5456deff25db3cf63227065..53588f23b6cabf6d115c9ef1aa834baa8db2b411 100644 (file)
Binary files a/win32/gui-2/GPSBabelGUI.res and b/win32/gui-2/GPSBabelGUI.res differ

diff --git a/win32/gui-2/options.pas b/win32/gui-2/options.pas
index da32e6bf68bc4d17c6e09430ab83fe136d7f037b..5979d16d3f2d251183b5ff008d6d13a731379baf 100644 (file)
--- a/win32/gui-2/options.pas
+++ b/win32/gui-2/options.pas
@@ -159,9 +159,11 @@ var
   xy, _xy: TPoint;\r
   xmax: Integer;\r
   lb: TLabel;\r
+  us: string;\r
+\r
 begin\r
   if (AList = nil) then Exit;\r
-  \r
+\r
   FOpts := AList;\r
 \r
   xy.x := 0;\r
@@ -188,13 +190,16 @@ begin
       btnHelp.ShowHint := True;\r
     end;\r
 \r
-    if FIsInput and (\r
-       (AnsiPos('generate ', o.hint) <> 0) or\r
-       (AnsiPos(' generate', o.hint) <> 0) or\r
-       (AnsiPos('output ', o.hint) <> 0) or\r
-       (AnsiPos(' output', o.hint) <> 0) or\r
-       (AnsiPos('write', o.hint) <> 0) or\r
-       (AnsiPos(' write', o.hint) <> 0)) then Continue;\r
+    us := AnsiLowerCase(o.hint);\r
+    if FIsInput and (AnsiPos('read', us) = 0) and\r
+      (\r
+       (AnsiPos('generate ', us) <> 0) or\r
+       (AnsiPos(' generate', us) <> 0) or\r
+       (AnsiPos('output ', us) <> 0) or\r
+       (AnsiPos(' output', us) <> 0) or\r
+       (AnsiPos('write', us) <> 0) or\r
+       (AnsiPos(' write', us) <> 0)\r
+      ) then Continue;\r
 \r
     chb := TCheckBox.Create(nil);\r
     o.chb := chb;\r

diff --git a/win32/gui-2/utils.pas b/win32/gui-2/utils.pas
index 94eded716f5e3cb4124908e77936d2b55f3352a7..a6a54d11c1001d8199454217d0d4ccb89a43b5dc 100644 (file)
--- a/win32/gui-2/utils.pas
+++ b/win32/gui-2/utils.pas
@@ -116,7 +116,7 @@ begin
   if (Copy(CommandLine, 1, 1) = '~') then\r
     sCmd := System.Copy(CommandLine, 2, Length(CommandLine) - 1)\r
   else\r
-    sCmd := SysUtils.Format('%s %s ', [gpsbabel_exe, CommandLine]);\r
+    sCmd := SysUtils.Format('"%s" %s ', [gpsbabel_exe, CommandLine]);\r
 \r
   SecurityAttr.nLength := sizeof(TSECURITYATTRIBUTES);\r
   SecurityAttr.bInheritHandle := true;\r